Remove some trailing whitespace.
Remove some stuff that we don't need to test anymore.