remove a few superfluous variables