Removed some stuff not needed on Java 1.4 anymore.