You are wrong again, James White! I am not a Greek "expert," but I understand this better than you! 😊
The key phrase, "not the removal of dirt from the body," precisely proves that he is talking about sacramental water Baptism! Why would he even mention the "removal of dirt" if water were not involved?
He mentions it because water is precisely what is involved, but he reminds us that it is not the mere action of removing dirt, but "an appeal to God for a clear conscience, through the resurrection of Jesus Christ."
The water that "corresponds to this" is mentioned just a verse before "Baptism"! 😊