More for #79, removed all references to mapref(n)
More for #79, removed all references to mapref(n)

Since mapref(n) was removed from Mars, all references to it had to be
removed from Athena.

AthenaModel/athena,AthenaModel/athena,AthenaModel/athena