Removed some JRE7 stuff