bin/mkstage4.bash: major clean up