Cleaner, loader now managed properly