Removed unnessary classes