removed remarked out junk