remove some unneeded magic