Removed unneeded code from Global class
Fixed tests wich suffered from this change