Remove dead code, change some comments.