(HEVC/Research) Code cleaning.