Remove dead code

This is #406 reworked against 1.7.