some more cleanup before merging and publish