get rid of some HxOverrides