Remove old stuff, add comments.