Remove version ifs