Removed not needed class and I think i fixed the orientation change
crash.  I think I fixed it, we have no current deterministic way to
recreate the error