Removed some unwanted CONSTANTS