removed findandDelete and buffertools dependency