Improving memory usage and missing values handling

is this import a leftover?