Merge "Remove extra using statements"