Remove a couple of no longer required import statements.
Assorted small changes to create build 83.