minor TODO removal and unused function removal