Remove global, replace with key