Removing more of using boost::shared_ptr