Fixed classpath, removed some unused code.