Cleanup and ready for publishing