When a service is shutdown then it does not call stop()

When a service is shutdown then it does not call the stop() function. Assuming that it makes sense for this to happen then this can be done before any further reaching patch handling shutdown as a single process can be done.