[#1159] Remove the 'id' from extra_vars

Fixes #1159. Remove the requirement for 'id' in the logic function.