Analytics By Tag cleanup
Merge branch 'jeff-KNOW3933cleanup'