Unused constants removed
Cosmetic changes