remove completed TODO
fix comment