2291249 removed commented out code