Revert "Better categories"

This reverts commit 0e162f011b16b1c09a8dae55775c12c9504c3719.