Removed any reference to the global namepace, not used anymore