Remove unnecessary exchanges

Change-Id: I6816cdd1ae340237ecfae6723f0236556fc892ca