add more todoand remove some unuse comment