Changed internal functions to not use RPC

Use only with corresponding psi46expert