ClassLoader cleanup/refactoring