I don't think we still need these commented lines, so please remove them