Remove additional global scope asumption