Remove unneeded todo's