Removed dependency on the geo lib