commenting and vestigial code removal round 2