Cleaning up the _mappedClass, which does not seem to be defined anywhere.  Probably not a clean fix...