Added clean up of $serviceDir