Attempt to clean up import namespace issues, extrif, etc
Some minor cleanup