Real fix for insider remove_service