remove ambiguous intermediate variables