publish: More content-cleaning

generated from commit 8debd4118f7d24549836c40920996d8543f5c61a