cleanup to match develop branch. note, analytics turned on