Change Remove*Descriptor to return void.