minor tweak + removed analytics code