TSAGE: Further renaming and removal of redundant code in R2R rim scene