Refactoring to comply with design specification, removal of http call references in the service layer