TSAGE: R2R - Some renaming, remove a dead variable