Removes more class globals