Removed dangling keystore/keypair headers