Cleaned up some things in TRN