Remove uneeded abstraction
Allow server to use custom keystore