Clean up to publish