[Ruby2] Further cleanup