cleanup code and more references to scenario files (still needs to be
verified for functionality)