[TODO] Removes TotalFinder