Removes all trace of Category implementation.
Revert "Shortens == method."

This reverts commit c4b27d400c54a98c168df0de16bc12f72868b034.