Remove dependency on domain in asap

Per @rkatic. Thanks.