Hopefully remove classpath for real