Remove all the duplicated code and just delegate to the class methods.

Eventually we'll probably move everything into the store when we deprecate the class methods.