adding analytics and removing tons of stuff