remove some unneeded code now that the types have been normalized