remove some uses of lwG etc