Cleanup marc tools integration