Remove owning raw pointers