class categories: cleanup