chore: Remove dead code, clarify names, other cleanup #583

Job	Run time
lint-pr-title / Verify the PR title matches conventional commit spec.	4s
	4s

Provide feedback