Remove some effect-less code.

Discussed in RT #41461