Revert "TP ++"

This reverts commit b47bf71fda55e9551862fff3627c758e1257d69d.