remove dead code, see #2224