@pjackson28 this was discussed in #2251. This PR was a cleanup some unrelated commits were in the other PR