#4415 /client refactor, reduce genutil dependancy on staking