Better Key handling

Wipe the existing keys for before this change.