Remove gorp from the importer.
Cleanup and add some comments.