Removed commented-out code per Gregg's review.