Remove credentials and add analytics