Removing old stuff, adding new stuff, java-related