Splitting out simulation and BSREL running
Cleanup in main