Finish and fix a few files.  remove unused files
remove unused files