Get rid of internal dependencies commons-geo and commons-util.