Feature/crossfilter

I could, but I would opt to leave them in unless anyone objects.  I think the comments are helpful