removed war-handler helper, no longer needed