Remove filterXXXX
Fix complexity complain