Remove obsolete service.
Better name for the service, references GH-21