Cleaning up whitespace, and removing some old code.