Obsolete constants removed