Improved removal of services