Remove some leftover cruft from #68