Remove gen 6 DW moves
2.2.3