Removed yet more extern directives