Remove IceMapper FIXME; unneeded