Remove some unnecessary constants