cleaned up constants and removed cateogry from events table