removed unncessary classes