a little bit more cleanup, but we should get rid of HxOverrides if possible