Added categories and removed unused stuff from the persistenceunit