Remove superfluous variables