Reworking cleanup.