[vo-amrwbenc/f29] clean-up