Clearing some redundant classess. Setting required indicators.