more cleanup of DISABLE_ALL_HACKS related code