Away with NightTerror/thimo as sups

Both did a very bad job. Introducing tons of bag maps, which haven't been tested before the cup.
If you introduce new maps, they have to be tested in first place.
So, away with them and replace them with a troll.