some script cleanup stuff
Merge branch 'develop'