Removes cyclic reference for WAFs too.