Instead of making sure an encounter properly cleans up their draws everywhere it would probably be a lot easier to keep a table of draws per unit and then remove all of them when that unit gets destroyed.

The encounters then only have to handle early removal of draws depending on the mechanics of the encounter like lines that appear and should disappear with certain debuffs.

This also saves times of remaking all the existing encounters and finding edge cases where theses errors happen.

#38