Remove some other hard-coded values.