Removed more duplicated classes