Merge "Clean imports in code"