Remove some hard coding.