Yes, those should be removed in a separate PR. Thanks.