QSV: spscleanup.
QSV: forgotten code.