Extract method
Remove unused method