2350023 removed commented out code