Removed unnecessary code + PEP8

Fix over 181d5f7ea82a35bc
Added category cleanup functionality to Janitor