PUBSTWO-1050 - really remove the template