I will remove the following: `Most of the codebase doesn't do this, let's try and move toward it.`