Removing Java 5 workarounds