Clean up KeyManager class