Remove all the cats
Merge branch 'clean_up'