remove dependence on infusion; removing items from data store works; filtering is faster

[jgsmith]

Got rid of the last vestiges of infusion.

Fixed how filtering was working to make sure removing an item from the data store worked. As a result, filtering data additions/deletions is much faster than before.