TSAGE: Some further cleanup of R2R drive room