discarded old map & search code