remove some dodgy casting