Remove dead code from 2.13