Clean up.
removed unneeded files
removed references to deleted files
minor edits