Merge "Remove unused class"