Remove ancient .plan.
Cleanup unused variable; add comments.