Remove rpcommonutils that was still in there