Remove unnecassary classes