1.30 cleanup.