Additionnal cleanup for publishing

Additionnal cleanup for publishing