Warrior check implemented, some debug info removed