A.A.
I am no expert, but my advice would be to leave him in underwear. I've also heard that you should have them take responsibility and have them clean up the mess. (Of course you have to clean it up too to make sure). I haven't done that but have heard from several that it helps.
Good Luck!
A.