TUP-2358:removed some unused classes.