removed any reference to old maps and match search now typechecks