removing unnecessary services - updating refactoring issue