waf: Cleanup in unites tool.