remove some unneeded hacks