Remove class loader (use decorator)