removed warlock todo