publish: Code cleanup.

generated from commit 7b98ef46a360cd01172aad9fa84451ad8730e2a6