Remove CatDex. Move GuaDex to its own header.