Get rid of version() use