Cleanup dual solenoid code