-1: need to remove use_cinder here too (and everywhere where it's still used).