fix comment, remove dead code