Fixing formatting issues.

Also removing some obsolete files.