Added category cleanup functionality to Janitor