Improve a few messages and update test baselines

Also removed more dead code.