Removed unused file.

And some other minor corrections.