simplify hacking options now that we are doing less stupid things