Updated to tag new agents and then only remove those tagged