Revert "new categories"

This reverts commit 0f3a373e2a4034866d87da4204b40f60c0559eb1.