Revert "analytics update"

This reverts commit 79d26cb321f71e9e1450719811626c742c045bc7.
Revert "adding remaining variables"

This reverts commit a29d438d1a16193b16e83a486350c32164a85fd7.