Take away GPS changes; take some comments out