Remove reference to some hard coded values