removed unnecessary service calls