Removing unused services
Merge pull request #431 from ifarkas/remove_unsued_services

Removing unused services