CORE-4426: 
Removed unused class