Remove latest_found hack for now