Cleansource and disabling lazy loading