Fixed some stuff that was previously configured for Java 7 and removed some files.