Remove todo which has been fixed