[0.6.153] remove dead code