Simplify upload_waterpoints script