Only generate private keys explicitly
Remove Optional.h