Delete scenarios deemed unnecessary, fix errors