remove filter
Apply code review
Merge