More work on #827: removed now-unneeded code