Remove spurious infrastructure keywords.