Stripped more dead code.

2018-04-12, Edouard Tisserant