Merge "More RS exceptions cleanup. Remove some dead code."