a bit more cleanup for SPC-690