First cut at cleanup infrastructure.