Removed extraneous files.
Merged.