More content, cleanup.