remove unneeded semi-colons and import statements

These are very minor changes.  No formatting should be changed and I re-compiled and re-ran all tests without issue on all the modules.