Re-factoring.
Remove category functionality. This will be done differently.