replaced AR datasource clarity code with clarity library