A lot of code clean-up in preparation for release.  Removed unused
imports and extra files.