[BigV] Remove unnecessary begin/end blocks