Import optimizations

The same with the big changes to vector taken out.