Remove some interior imports in the code.  Not really needed but nice to have them gone.