Remove unnessesery classes
Remove unnessesery classes