Most of these using statements can also be removed after that change.