Remove stored reference

 * Easier to test.