remove buffkill
[...update submodules...]