Remove spurious popd on cleanup.

pushd isn't used, so popd just makes for an error message. Bringing back
the pushd with a popd in cleanup might be preferable, depending on what
that allows in interactive usage.