Revert "Revert "Removed all the cats""

This reverts commit 6772deac4b38ea92b00968e63ddac7ec4fbaf3d4.