Remove mixing of shared_ptr and *