Add real content and cleanup