RM2.8 code cleanup