Remove redundancy in TOS