Remove more legacy code. Add RTL option.