Get rid of WeakReference