Revert "clean up - focused on Cataclysm content"

This reverts commit 08996cdfe144e859931a20f2ae378138ba17ca46.