Deleted old keys.
Some code clean up.