Getting rid of old Analytics Code