Removed obsolete keys