Nuked a couple of globals