===> Cleaning for agm-1.3.1