Removed more obsolete storage formatting code.
Improved storage format of experimental classes.