Remove pushd/popd

Failing sometimes, f it