More cleanup to prep for upstream patch file