Removed duplicated classes