Removed #include and references to std::shared_ptr