Added service cleanup when sparks are closed