removed old Service class