Import clean up