SP2 cleanup.