Fix some spurious cruft