Feature/abort publishing tidy up