Removed Ids from templates