Clean up client credentials and expires handling