Merge branch 'alvin-master-patch-bd4d' into 'master'

Remove really old TODO items

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143996



Merged-by: Evan Read <eread@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Co-authored-by: Alvin Gounder <agounder@gitlab.com>