Remove some trailing whitespace and commented code

2017-12-14, Gary Kramlich