can we remove this commented stuff?