Cleanup around nonces