Starting to remove bits of old JIT one step at a time (should be dead code)