remove some more weirdness