This Epic captures any remaining clean up work or improvements we want to make following on from https://gitlab.com/groups/gitlab-org/-/epics/1316