Simplifying SPF maintenance

Follow