[TIMOB-13950] cleaned up the analytic system

this should be back ported to 3.1.X as well