HOPKINS: Get rid of more useless global variables