Minor cleanup of scripts
Merge branch 'hotfix/cleanup'