[FEATURE] RT-2447: BRL Tab code cleanup