Remove unused files and some code

Removed files that are unused.  Also remove some snippets of code that are no longer needed.