Fixed bug in updating current location.  Deleted unreachable view controller.