propose to clean KeyValueStorage before removing shutdown hook and do it in separate try - catch block