Got rid of global