Remove unused filter.
Update SAL annotations to v2.
Static analysis fix.