Added TODO comments to handle categories in the near future and removed unused code