Remove unneeded popd's