removing index, standardizing event names in constants, session cleanup