Remove global scope assumptions