Removed redundant fields and kept surface as pickled object