remove more shared ptrs