added group service and took out unnecessary stuff in user service.