Fix cleanup #87

@xiaohe27 @kheradmand @yzhang90 Please review this change.

This change fixes a bug introduced in #87 . Please see my comment there. Essentially since translate2RV is always true now, I should retain the code in the else branch rather than in the if branch.

I will write some integration test for EnforceMOP once the problem of EnforceMOP in RVMonitor is resolved (see RV-Monitor issue # 100). So we can prevent it from being introduced in the first place.

Thanks,

Qingzhou