TSAGE: R2R - Remove superfluous debug display, some renaming