Revert "Recommit these filter, pls ignore pre work"

This reverts commit 4885ae3fd15ca994f5a4101eb05c04ce0f9a5a20.