RBV: code cleanup