Unwanted constants removed