Some tidy up and service started notification