Removed logs and Fixed template fields