remove unused code and irrelevant comment.