Cleaning up after ourselves (after scenarios for now); with @jan-molak