Cleanup
Merge branch 'only_render_newer'