removed duplicated classes that occured during the refactoring.