Remove the use of global