Add tracking google analytics, cleanup