Some cleanups for api_trakt