Removed the todos which are now implemented.