Clean up vanilla.java