Remove useless class globals
Minor cleanup