Simplify.
Remove old comments.