Refactored shell scripts
Merge branch 'master' into nd_approve_change
removed some unused stuff