removed duplicated classes