Cleanup, round 2