Merge "Removed unused class and its test"