Cleaned up classpath