One more cleanup.