remove some comment-out.