Deleted alot of commented-out lines.  We can rollback if we need to.