Mali: more mergeing and cleanup