clean up from non rpc code