removed more extraneous files, some code cleanup