Issue #40 : remove dead code