DAR-1549: Badge ads clean up