removed service layer