Remove condition that was never met on zoo-evil
Misc changes