remove TODO comment which done