Fix remove_service, was broken