Remove conversion since it can easily be done through Vault, clean up source code