Get rid of oo_.dr.kstate
In particular, see the discussion in
#1653 (closed)