Cleared out most of the huge chunks of commented out junk code.