Same as above. I think we should delete completely commented code if it is not needed.