switch back to pushd / popd
remove unneeded debug stuff