deleteByQuery

mainly deleteByQuery here.  Some other 2.1 related support as well.