sawyerx mostly did this
remove more stuff now in RT