Analytics updates; remove debug code