minor remove of TODO