really cleanup WO parser