What

Squash all the commits for this story into a single commit. Create an issue outlining the why for this work and create a PR that has the code and the how