CE-26 Removing default template