qless tagging code cleanup