more clean up of Florin mess
more clean up of TSP stuff