Fixed extra using statements