Use $HOME for keystore
Cleanup