Clean up prototype 2 scripts in preparation for prototype 3