remove extra popd