Cleanup: class loader deprecation and simplification

Time to get rid of this thing: marking it as deprecated.
Fixed :-)