Cleanup some old PRs and make the world green again Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>