You do want to swap everything off the old TB, including the air bypass for idle control. If you don't you'll find yourself idling at about 2000RPM :wink:
The computer is somewhat adaptive, so disconnecting the battery while you work on it will reset it, and it will learn and adapt to the new TB.
Peter