Cleanup

@owolabileg and @yzhang90, please review this clean-up change
This looks like wrong, I should copy out the code in the else branch because translate2RV is always true.