Remove commented/removed code

[ci skip]
Refactor import code.

 * Move iteration create/update to private method.
 * Use better variable names.