removed unnessecary classes