Removing AD-SAL dependencies