Removed todo's from the text