CLEANUP: Removed category component.