adjust to publish workflow refactoring and some cleanup