removed unnessesery classes