[AAI-3] Remove dependency on SDC