remove some hard-coded stuff