Gald Warrior cleanup