SM-12912 Keystore cleanup