Remove dependency on external Stash