Remove commented code; improve comments.