remove unused fmt and improve TODO