Issue 4 and 12

* Always remove disguise condition
* Remove MarkForDeath condition
changing function appearance order
no code has been changed#
just the order (have also removed so unneed whole lines of whitespace)