Additional sq parameters cleanup.