More bash script cleanup