Removing more unnecessary code, including TFlag.