Removed unused class, It's all available in Utils