Merge "Remove unused method and test"