Removed InstructionHandler and InstructionList