Simplify unpublishing scenario