Remove some hard-coding