More file cleanup.
Some minor changes and some deletions of extraneous files.