Can you add a commit to this PR to remove this as well as any other changes we need to make?