Remove TODO/suggestion since it will be mentioned in the PR