more analytics route cleanup