Remove now unnecessary commented out code