Cleanup of keys modules
18 files changed