Revised comments, and removed old code.