Remove things I have not used in a while.

Also: whitespace.
Merge branch 'master' into leo-work