Merge "Remove unused import and method"