More RTL cleanup