Fixed a couple of typos, removed cruft

Removed the crappy, low-value autogenerated messages from the
expectations, not adding anything and just creates editing overhead