fix dpb full and fb in shvc
cleanup