Removed helpless todo's