fix comment and remove dead code