Revert "TSP Update"

This reverts commit 01888a397c933033a441be16daf033b45bb098d6.