(-) remove misplaced TODO points