That's a change that always seems to help the performance, or at least the bike seems happier.

A chain whip and a cassette remover aren't very expensive, so you might consider picking them up somewhere along the line. Christmas is right around the corner

I know it's fashionable to rag on Trek but they make fine bikes.