Fixing bug to remove service