cleanup and google analytics code