Merge "Removed unused variables"