Merge "removed unused variables"