remove filter

remove filter, change method names