General cleanup of old/obselete/deprecated code. Deleted inefficient geospatial code. Removed code dealing with 60m extraction buffer.