Remove unneeded classes

Minimum required java version is java7 so there is no need to workaround
java 5 macosx bug