Remove "will be removed in ..." comments