[3.9] Remove dead code