Remove AMD expectation from main flow