Clean up to make recent pull request lint