Removing echoNumber from templates