Much more efficient service removal