Warlock cleanup