Clean up more refactored JIT code and unused logic.