Remove FilterVisitor and FilterVisitor2

It is time to move on