* Small file changes.
* Removed unneeded file.