update code for simple scenario
fix typo for swift
fix quantum cleanup after merge
fix undef'ed parameters