Removed another main method and more unused imports