Major cleanup of loader_postgis