Keystore optimizations
Don't need that anymore