Remove hxt type conversions