Wt588d cleanup