bottle-run.sh cleaned up more