Deleted unecessary classes