Yes, I think we could if no other possible LeaderElectionAgent will need it. And it will need to change the program flow say create some method to replace prestart/poststop etc. So I just keep it untouched in this pull request. Or you think we should do away it right now?