Removed clipper, added geolibrary