Remove deprecated client_id from the properties files and auth and use the app_id for everything instead.