1.sh: misc cleanup