Remove stash, fix error redirects