Revert "Adding categories, some cleanup"

This reverts commit af66e32006670890238a49b79b12968d45bf6168.