cleanup up import/upgrade steps, refs #8321