Merge "Remove unused imports from Main.java"