Cleanup, work on wiv_mwov'.