cleanup of code and scripts
Merge pull request #3609 from civanch/stacking_steping_cleanup

Sim -- Cleanup of SIM core