Removing files no longer used, updating others
Merge pull request #261 from khawkins/old_file_cleanup

Removing files no longer used, updating others