Removed dependency on ruby client