Nice cleanup.