Update to fix clean up on start up of service