Multi key infrastructure, cleanup.