Remove dead code from previous commit