remove the jdk 6 compliance changes