Removed unused imports.  Added serial versions where warnings were
indicated.