Dealing with class vars properly

And removing old ver cruft.