Clean up for tag. Remove for optimizer as the current logic was unneeded.