quick cleanup of tagging func

removed some lines and logic