Revert "More streamlined scripting, use of source and functions to not repeat ourselves"

This reverts commit 756b3a03a4b6f2096f0a055618a9964c8b23da59.