Effort to migrate to UniquePtrSurface i.e unique ptr with a custom deleter provided by @ssnyder
UniquePtrSurface