follow-up to #637: remove duplicate code and update tsam version
Hosted by CPS Cyber Physical Systems .