cleanup analytics draft
work on session consolidation for analytics