removed all structure. now the structure code simply returns the unstructured MAP.