Merge "Clean up imports"