Final cleanup for Tbr and TRJ stuff