Remove sketchy method of retaining view.  Instead use dictionary that only holds values that we need to retain.