Remove complexity of origin search to allow more distance focused noise searches