Get rid of the cruft and update google-analytics snippet