Remove temporary token and add support diagnostics
