Big cleanup.