#331 Cleaned up a lot of comments, and crufty unhelpful commented out code.