Removed unused class that become obsolete during refactoring