Cleaning up TP solution