removed commented out junk