More cleanup of initial import code