retiring OxygenEntitiesDictionary

Moved entries to keydefs
Updated references