Fix memory leak when viewing unsaved collections (held a reference to a disposed image).
Fix mistaken commit.
Remove duplicate code.