Removed extern references which aren't used anymore