Cleanup and first version of script running
This refs #4837