progress on cleaning up tags