LP#1693036: Simplify template, cleanup preview data