Cleanup: class loader deprecation and simplification

Time to get rid of this thing: marking it as deprecated.
Looks like this call isn't done anymore now. Is that call required?