Removed strings and the TODO comment.