Removed scoped_ptrs