x3-paper template cleanup