Much more cleanup.