Remove old waf calls