Finish cleaning up analytics module.