renamed, delete cruft
delete cruft
Work on (storage) configuration and marshallers