clean up scenario loading some more