Fix keyfile location and cleanup