Removed some unused constants