Remove old track_errors logic and some forgotten workarounds