Remove redundant analytics code