Even more cleanup.