Remove wrapping of weak_ptr since it confuses more than it helps