More overlay cleanup.