Add support for service removal