Remove global vars