Remove cloning Template object - it is confusing