Removed old extra definitions of constant