Pre-trim commit

Begin work on trimming down unnecessary flair to speed up upcoming
changes.