Merge "Removed unused imports"