Cleanup main.java