Fix: code to cleanup data on import
Fix: more code to cleanup data on import