#133 Remove old-style target-state solver