clean-up of hard-coded values.