#43 remove dead code