More cleanup for utility programs