refactor eip start/stop control to conductor

and cleanup a little bit of the signal mess.
fix merge error