Remove unused file.
Clean up some trailing whitespace.