remove code from old client that has been merged into new code
update the token exchange to pass the test