Remove two globals, the three others are bad enough