AWDEncoder - clean up