More post-waf cleanup