Deleted TODO Comment for value-suggestion