AAD-76: ability to finish referral + some cleanup