Remove unused keys; Add some new ones