Modified fact removal not to use filter, for both the interface and none
interface methods. Want to see if performance improves.