Core/TrialOfChampions: Some cleanups