another eclipse classpath fix and some more code cleanup