Delete OR class. Make some changes in Collect class.