update client_secret, cleanup messages