Tidy up of publish process