Remove global var check