clean up map code; add TODO for NUCCORE-1269