Ensure import cleans up after itself
Remove untested criteria from DataMapper