Remove jdk 6 stuff till we're sure the project is entirely converted over.