junit added to classpath, removed some unused classes