Deleted unneccessary and duplicated classes