Remove DerivedWrapper