small code cleanup
remove a work-around that was only needed for Java 6