Remove some hard coded values