Main.java cleanup, removed unused bits