remove dead code and names