Cleanup round 1.