Removed legacy category cleaner
Cleaned some cleaners