remove cruft
remove cruft
step up to libav flavor country