Revert "Cleanup and category fixes."

This reverts commit d9ae1a37545e6c676844958a96cabacebd6bdc65.
Revert "Stage 2, still not usable"

This reverts commit 7d7a0fe44aef40e0f6fc60e77a83cdf75135e740.