TSP: cleanup

Change-Id: Id2ab35a19df5d180a42baec916a5670fe4955b81