small cluster script cleanups