Add some content and cleanup