Remove some unused keys; something more