mass cleanup of WO parser