Cleaned up the classloader