fix todo removing