Remove unused old files
Fixed task impl; using y2nw
Restore previous tests