Yeah, next update to the PR will clean this out.