Remove unnecessary includes, whitespace, etc.
Revert README.md changes for another time.