Remove ScopedPointer, ContainerDeletePolicy