Started eliminating globals