refactoring remove service and listeners