This issue tracks code maintenance issues identify in prs that should eventually be addressed. copy the link to the comment in this issue