If this is not actually needed, then let's remove the commented lines.