Carlos Rodriguez cleanup