removed unnecesary code from services