Remove unncessary classes