Removed old references to long and lat variables