More language level cleanup