Cleaned up GeoEntity and Universal code.