Remove some unused Constants