remove some hard-coded vars