Removed duplicated class