comments and remove dead code