issue-220 remove dead code