Improve VideoBuffer remove performance