remove dead code and comments