Remove dependency on AOD