issue #21752 remove old dropIfExists code and stick with normal function...

... definition