get rid of last waf-isms