#23: remove dead code