Issue #128: remove dead code