Remove dead code (since [2356145])