Imported data and some cleanup