remove some more unused stuff, including conflicting names in dtypes.h