Remove stale subkey handling from match_time