Make imports a bit more explicit
Remove ISMI id validation

See if this speeds things up.