Adapted to new API
First step remove
Removing Descriptor finished